Skip to content

Revert "release-windows.yml: fixed collecting files [skip ci] (#6904)"#6910

Closed
danmar wants to merge 3 commits intocppcheck-opensource:mainfrom
cppchecksolutions:revert-pr-6904
Closed

Revert "release-windows.yml: fixed collecting files [skip ci] (#6904)"#6910
danmar wants to merge 3 commits intocppcheck-opensource:mainfrom
cppchecksolutions:revert-pr-6904

Conversation

@danmar
Copy link
Copy Markdown
Collaborator

@danmar danmar commented Oct 13, 2024

This reverts commit d23c88d.

@danmar
Copy link
Copy Markdown
Collaborator Author

danmar commented Oct 13, 2024

@firewave this is just a "git revert" of your PR. Feel free to make a new better PR..

@firewave
Copy link
Copy Markdown
Collaborator

firewave commented Oct 13, 2024

That is not sufficient.

The history of the commits might still be intact. But my commit breaks git blame because the file was removed so every line will be attributed to the commit that re-instated it.

@chrchr-github
Copy link
Copy Markdown
Collaborator

So what needs to be done? Reset + force-push to main?

@firewave
Copy link
Copy Markdown
Collaborator

So what needs to be done? Reset + force-push to main?

At least a force-push. Reset, drop, squash - doesn't matter what initiates it as long as we get the revision history back.

@firewave
Copy link
Copy Markdown
Collaborator

Let's discuss in #6904 as it has all the information and I do not what to CC people in two different PRs.

@firewave
Copy link
Copy Markdown
Collaborator

Closed as this is no longer necessary.

@danmar danmar deleted the revert-pr-6904 branch December 16, 2024 10:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants